Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Wed, 27 Sep 2017 13:39:48 +0000 (09:39 -0400)
committerTom Rini <[email protected]>
Wed, 27 Sep 2017 13:39:48 +0000 (09:39 -0400)

Trivial merge